Revision: tla--edgomez--1.1--patch-9
Archive: ed.gomez@free.fr--2003-1
Creator: Edouard Gomez <ed.gomez@free.fr>
Date: Tue Jul 15 21:30:48 CEST 2003
Standard-date: 2003-07-15 19:30:48 GMT
Summary: Merged tom's branch last changes.
Keywords: 
New-files: ./libarch/cmd-file-find.c
    ./libarch/cmd-file-find.h
    ./libneon/.arch-ids/=dont-care ./libneon/.arch-ids/=id
    ./libneon/COPYING.LIB ./libneon/ChangeLog
    ./libneon/Makefile.in
    ./libneon/PLUGIN/.arch-ids/=dont-care
    ./libneon/PLUGIN/AUTOCONF ./libneon/PLUGIN/REQ
    ./libneon/README ./libneon/aclocal.m4
    ./libneon/autogen.sh ./libneon/config.guess
    ./libneon/config.h.in ./libneon/config.sub
    ./libneon/configure ./libneon/configure.in
    ./libneon/expat/.arch-ids/=dont-care
    ./libneon/expat/ac_c_bigendian_cross.m4
    ./libneon/expat/ascii.h ./libneon/expat/asciitab.h
    ./libneon/expat/expat.h
    ./libneon/expat/expat_config.h.in
    ./libneon/expat/iasciitab.h ./libneon/expat/internal.h
    ./libneon/expat/latin1tab.h ./libneon/expat/nametab.h
    ./libneon/expat/utf8tab.h ./libneon/expat/winconfig.h
    ./libneon/expat/xmlparse.c ./libneon/expat/xmlrole.c
    ./libneon/expat/xmlrole.h ./libneon/expat/xmltok.c
    ./libneon/expat/xmltok.h ./libneon/expat/xmltok_impl.c
    ./libneon/expat/xmltok_impl.h
    ./libneon/expat/xmltok_ns.c ./libneon/install-sh
    ./libneon/libs.mk.in ./libneon/ltconfig
    ./libneon/ltmain.sh
    ./libneon/macros/.arch-ids/ChangeLog.id
    ./libneon/macros/.arch-ids/neon-test.m4.id
    ./libneon/macros/.arch-ids/neon-xml-parser.m4.id
    ./libneon/macros/.arch-ids/neon.m4.id
    ./libneon/macros/.arch-ids/socklen-arg-type.m4.id
    ./libneon/macros/ChangeLog
    ./libneon/macros/neon-test.m4
    ./libneon/macros/neon-xml-parser.m4
    ./libneon/macros/neon.m4
    ./libneon/macros/socklen-arg-type.m4
    ./libneon/memleak.h ./libneon/ne_207.c
    ./libneon/ne_207.h ./libneon/ne_acl.c ./libneon/ne_acl.h
    ./libneon/ne_alloc.c ./libneon/ne_alloc.h
    ./libneon/ne_auth.c ./libneon/ne_auth.h
    ./libneon/ne_basic.c ./libneon/ne_basic.h
    ./libneon/ne_compress.c ./libneon/ne_compress.h
    ./libneon/ne_cookies.c ./libneon/ne_cookies.h
    ./libneon/ne_dates.c ./libneon/ne_dates.h
    ./libneon/ne_defs.h ./libneon/ne_i18n.c
    ./libneon/ne_i18n.h ./libneon/ne_locks.c
    ./libneon/ne_locks.h ./libneon/ne_md5.c
    ./libneon/ne_md5.h ./libneon/ne_openssl.c
    ./libneon/ne_private.h ./libneon/ne_privssl.h
    ./libneon/ne_props.c ./libneon/ne_props.h
    ./libneon/ne_redirect.c ./libneon/ne_redirect.h
    ./libneon/ne_request.c ./libneon/ne_request.h
    ./libneon/ne_session.c ./libneon/ne_session.h
    ./libneon/ne_socket.c ./libneon/ne_socket.h
    ./libneon/ne_ssl.h ./libneon/ne_string.c
    ./libneon/ne_string.h ./libneon/ne_stubssl.c
    ./libneon/ne_uri.c ./libneon/ne_uri.h
    ./libneon/ne_utils.c ./libneon/ne_utils.h
    ./libneon/ne_xml.c ./libneon/ne_xml.h
New-directories: ./libneon ./libneon/.arch-ids
    ./libneon/PLUGIN ./libneon/PLUGIN/.arch-ids
    ./libneon/expat ./libneon/expat/.arch-ids
    ./libneon/macros ./libneon/macros/.arch-ids
Removed-files: ./tutorial/.arch-ids/=id
    ./tutorial/Makefile.in ./tutorial/PLUGIN/.arch-ids/=id
    ./tutorial/PLUGIN/.arch-ids/REQ.id
    ./tutorial/PLUGIN/REQ ./tutorial/arch.doc
    ./tutorial/archive-caching.doc
    ./tutorial/changeset-format.doc
    ./tutorial/checking-in-changes.doc
    ./tutorial/cherrypicking-changes.doc
    ./tutorial/development-branches.doc
    ./tutorial/document-license.doc
    ./tutorial/elementary-branches.doc
    ./tutorial/exploring-changesets.doc
    ./tutorial/importing-first.doc
    ./tutorial/in-general.doc ./tutorial/indexes.doc
    ./tutorial/introducing-changesets.doc
    ./tutorial/introducing-replay.doc
    ./tutorial/introducing-yourself.doc
    ./tutorial/introduction.doc ./tutorial/inventories.doc
    ./tutorial/inventory-tags.doc
    ./tutorial/little-help.doc
    ./tutorial/multi-tree-projects.doc
    ./tutorial/naming-conventions.doc
    ./tutorial/new-archive.doc ./tutorial/new-project.doc
    ./tutorial/new-source.doc ./tutorial/on-hacking.doc
    ./tutorial/project-management.doc
    ./tutorial/retrieving-earlier-revisions.doc
    ./tutorial/revision-libraries.doc
    ./tutorial/selected-files-commits.doc
    ./tutorial/shared-and-public-archives.doc
    ./tutorial/source-license.doc
    ./tutorial/symbolic-tags.doc
    ./tutorial/system-requirements.doc
    ./tutorial/tree-history.doc
    ./tutorial/update-commit.doc ./tutorial/using-hooks.doc
Removed-directories: ./tutorial ./tutorial/.arch-ids
    ./tutorial/PLUGIN ./tutorial/PLUGIN/.arch-ids
Renamed-files: 
Renamed-directories: 
Modified-files: ./=THANKS ./ChangeLog
    ./libarch/cmd-deltapatch.c ./libarch/cmd-file-diffs.c
    ./libarch/cmd-my-default-archive.c
    ./libarch/cmd-my-revision-library.c
    ./libarch/cmd-revdelta.c
    ./libarch/cmd-set-tree-version.c
    ./libarch/cmd-star-merge.c ./libarch/cmd-undo-changes.c
    ./libarch/cmd-what-changed.c ./libarch/cmds.c
    ./libarch/diffs.c ./libarch/file-diffs.c
    ./libarch/file-diffs.h ./libarch/invent.c
    ./libarch/local-cache.c ./libarch/pfs-dav.c
    ./libarch/star-merge.c ./libarch/star-merge.h
    ./tla/Makefile.in ./tla/PLUGIN/REQ
Modified-directories: 
New-patches: asuffield@debian.org--gluck-2003/tla--devo--1.0--base-0
    asuffield@debian.org--gluck-2003/tla--devo--1.0--patch-1
    asuffield@debian.org--gluck-2003/tla--devo--1.1--base-0
    asuffield@debian.org--gluck-2003/tla--devo--1.1--patch-1
    bulb@ucw.cz--arch-2003/tla--bulb--1.1--base-0
    bulb@ucw.cz--arch-2003/tla--bulb--1.1--patch-1
    bulb@ucw.cz--arch-2003/tla--bulb--1.1--patch-2
    bulb@ucw.cz--arch-2003/tla--bulb--1.1--patch-3
    bulb@ucw.cz--arch-2003/tla--bulb--1.1--patch-4
    bulb@ucw.cz--arch-2003/tla--bulb--1.1--patch-5
    ed.gomez@free.fr--2003-1/tla--edgomez--1.1--patch-9
    giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-22
    giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-23
    giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-24
    jblack@merconline.com--2003/tla--devo--1.1--patch-11
    jblack@merconline.com--2003/tla--devo--1.1--patch-12
    jblack@merconline.com--2003/tla--devo--1.1--patch-13
    jblack@merconline.com--2003/tla--devo--1.1--patch-14
    jblack@merconline.com--2003/tla--devo--1.1--patch-15
    jblack@merconline.com--2003/tla--devo--1.1--patch-16
    jblack@merconline.com--2003/tla--devo--1.1--patch-17
    jblack@merconline.com--2003/tla--devo--1.1--patch-18
    jblack@merconline.com--2003/tla--devo--1.1--patch-19
    jblack@merconline.com--2003/tla--devo--1.1--patch-20
    jblack@merconline.com--2003/tla--devo--1.1--patch-21
    jblack@merconline.com--2003/tla--devo--1.1--patch-22
    jblack@merconline.com--2003/tla--devo--1.1--patch-23
    lord@emf.net--2003b/tla--devo--1.1--patch-93
    lord@emf.net--2003b/tla--devo--1.1--patch-94
    lord@emf.net--2003b/tla--devo--1.1--patch-95
    lord@emf.net--2003b/tla--devo--1.1--patch-96
    lord@emf.net--2003b/tla--devo--1.1--patch-97
    lord@emf.net--2003b/tla--devo--1.1--patch-98
    lord@emf.net--2003b/tla--devo--1.1--patch-99
    lord@emf.net--2003b/tla--devo--1.1--patch-100
    lord@emf.net--2003b/tla--devo--1.1--patch-101
    lord@emf.net--2003b/tla--devo--1.1--patch-102
    lord@emf.net--2003b/tla--devo--1.1--patch-103
    lord@emf.net--2003b/tla--devo--1.1--patch-104
    rwa@alumni.princeton.edu--home-2003b/tla--rwa--1.1--base-0
    rwa@alumni.princeton.edu--home-2003b/tla--rwa--1.1--patch-1
    software@srparish.net--2003tla/tla--devo--1.1--patch-3
    software@srparish.net--2003tla/tla--devo--1.1--patch-4
    software@srparish.net--2003tla/tla--devo--1.1--patch-5
    software@srparish.net--2003tla/tla--devo--1.1--patch-6
Removed-patches: ed.gomez@free.fr--2003-1/tla--edgomez--1.1--patch-1

Ok it's the first time i play with star-merge command. In order to avoid
unresolvable conflicts, i had to merge back the old neon. But, Tom's branch
updates it to a newer one (0.24.0) anyway.

/!\ This patch does not add any pickable feature or fix.

Patches applied:

 * asuffield@debian.org--gluck-2003/tla--devo--1.0--base-0
   tag of lord@emf.net--2003b/tla--devo--1.0--patch-89

 * asuffield@debian.org--gluck-2003/tla--devo--1.0--patch-1
   Initialise op for my-default-archive/my-revision-library

 * asuffield@debian.org--gluck-2003/tla--devo--1.1--base-0
   tag of lord@emf.net--2003b/tla--devo--1.1--patch-92

 * asuffield@debian.org--gluck-2003/tla--devo--1.1--patch-1
   Merge from tla--devo--1.0

 * bulb@ucw.cz--arch-2003/tla--bulb--1.1--base-0
   tag of lord@emf.net--2003b/tla--devo--1.1--patch-90

 * bulb@ucw.cz--arch-2003/tla--bulb--1.1--patch-1
   what-changed, file-diffs and undo now create pristine tree on-demand

 * bulb@ucw.cz--arch-2003/tla--bulb--1.1--patch-2
   Sync with tla--devo--1.1--patch-91

 * bulb@ucw.cz--arch-2003/tla--bulb--1.1--patch-3
   Merged tla--devo--1.1

 * bulb@ucw.cz--arch-2003/tla--bulb--1.1--patch-4
   file-diffs command and --new-file option

 * bulb@ucw.cz--arch-2003/tla--bulb--1.1--patch-5
   arch_find_or_make_local_copy searches in syblings

 * giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-22
   merge with lord@emf.net-2003b/tla--devo--1.1--patch-86

 * giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-23
   lord@emf.net--2003b/tla--devo--1.1--patch-92

 * giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-24
   fix compiler warning in libarch/invent.c

 * jblack@merconline.com--2003/tla--devo--1.1--patch-11
   Pulled Toms tree back in

 * jblack@merconline.com--2003/tla--devo--1.1--patch-12
   Clarified the purpose of deltapatch

 * jblack@merconline.com--2003/tla--devo--1.1--patch-13
   Changed inventory-tags.doc to use '(add|delete|move)-tag' 'intead of '(add|delete|move)' as they are more explicit and the primary name of the commands

 * jblack@merconline.com--2003/tla--devo--1.1--patch-14
   Clarified --help for revdelta.

 * jblack@merconline.com--2003/tla--devo--1.1--patch-15
   Clarified the clarification for revdelta help in patch-14.

 * jblack@merconline.com--2003/tla--devo--1.1--patch-16
   simplified star-merge example in tutorial

 * jblack@merconline.com--2003/tla--devo--1.1--patch-17
   Making deltarev feel more like changeset

 * jblack@merconline.com--2003/tla--devo--1.1--patch-18
   Star merged Toms tree

 * jblack@merconline.com--2003/tla--devo--1.1--patch-19
   Clearing up language about 'patch-reports' 

 * jblack@merconline.com--2003/tla--devo--1.1--patch-20
   Adding glossary and quick start examples

 * jblack@merconline.com--2003/tla--devo--1.1--patch-21
   Paragraph closing missing in using-hooks put in

 * jblack@merconline.com--2003/tla--devo--1.1--patch-22
   Fixed tla command summary redo alias help.

 * jblack@merconline.com--2003/tla--devo--1.1--patch-23
   added examples-quickstart.doc

 * lord@emf.net--2003b/tla--devo--1.1--patch-93
   doc foo

 * lord@emf.net--2003b/tla--devo--1.1--patch-94
   merge my-revision-library fix from asuffield

 * lord@emf.net--2003b/tla--devo--1.1--patch-95
   merge doc and help messages changes from jblack

 * lord@emf.net--2003b/tla--devo--1.1--patch-96
   fix some code formatting issues

 * lord@emf.net--2003b/tla--devo--1.1--patch-97
   improve regularity of revdelta CLI (jblack)

 * lord@emf.net--2003b/tla--devo--1.1--patch-98
   doc extensions and help fixes (jblack)

 * lord@emf.net--2003b/tla--devo--1.1--patch-99
   merge in libneon upgrade from srparish

 * lord@emf.net--2003b/tla--devo--1.1--patch-100
   compiler warning fix from giles

 * lord@emf.net--2003b/tla--devo--1.1--patch-101
   set-tree-version --help fix (rwa)

 * lord@emf.net--2003b/tla--devo--1.1--patch-102
   new star-merge option to generate but not apply changeset

 * lord@emf.net--2003b/tla--devo--1.1--patch-103
   new command (file-find) and pristine-tree automation (merge w/ bulb)

 * lord@emf.net--2003b/tla--devo--1.1--patch-104
   remove the tutoral (now in docs-tla)

 * rwa@alumni.princeton.edu--home-2003b/tla--rwa--1.1--base-0
   tag of lord@emf.net--2003b/tla--devo--1.1--patch-90

 * rwa@alumni.princeton.edu--home-2003b/tla--rwa--1.1--patch-1
   add DIR to --dir help output for consistency

 * software@srparish.net--2003tla/tla--devo--1.1--patch-3
   merge with lord

 * software@srparish.net--2003tla/tla--devo--1.1--patch-4
   upgraded to neon 0.24.0, expat 1.95.6

 * software@srparish.net--2003tla/tla--devo--1.1--patch-5
   removed ne_redirect_register call, moved expat macro file

 * software@srparish.net--2003tla/tla--devo--1.1--patch-6
   enforced the use of included expat

